Skip to content

Merge develop into main#12

Merged
wben1998 merged 68 commits intomainfrom
develop
Jun 15, 2025
Merged

Merge develop into main#12
wben1998 merged 68 commits intomainfrom
develop

Conversation

@wben1998
Copy link
Collaborator

No description provided.

bob-th and others added 30 commits May 30, 2025 18:15
Add database connection functionality
actually add the database connection now
Helena Zhao and others added 29 commits June 14, 2025 23:55
…e/club-page-student-view

Implement Club List and Club Page
merge again with develop branch
…/api_endpoint

Updated api endpoints to prevent conflicts with other endpoints
…e/club-dashboard-events

Feature/club dashboard events
…/unresolved_merge

Fix branch merge conflict
…/unresolved_merge

Fix branch merge conflict #2
* change the location of frontend files for editing club page

* Added an button to confirm changes to club info

---------

Co-authored-by: Steve <steve.nguyen.stng@gmail.com>
@wben1998 wben1998 merged commit eae00ee into main Jun 15, 2025
7 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants